diff --git a/.travis.yml b/.travis.yml
index 1bb8b4e417..8bfb36107f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ env:
     - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
     - LOGS_DIR=/tmp/logs
     - CYPRESS_RECORD_KEY=4aa7a1c0-3a4f-444e-b324-6fc305a543a8
-    - NPM_AUTH_TOKEN_CI_PR=810c9089-b5e8-4348-8c89-61a1c2461d68
+    - NPM_AUTH_TOKEN_CI_PR=d05d9a8c-02db-413b-a412-aa27ab527213
 
 #     test cypress smoke
 testSmokeCy: &testSmokeCy
diff --git a/demo/src/app/components/+popover/demos/adaptive-position/adaptive-position.html b/demo/src/app/components/+popover/demos/adaptive-position/adaptive-position.html
new file mode 100644
index 0000000000..b7f6e20a93
--- /dev/null
+++ b/demo/src/app/components/+popover/demos/adaptive-position/adaptive-position.html
@@ -0,0 +1,15 @@
+<button type="button" class="btn btn-default btn-secondary"
+        popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."
+        popoverTitle="Popover on top"
+        [adaptivePosition]="false"
+        placement="top">
+  Popover on top
+</button>
+
+<button type="button" class="btn btn-default btn-secondary"
+        popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."
+        popoverTitle="Popover on right"
+        [adaptivePosition]="false"
+        placement="right">
+  Popover on right
+</button>
\ No newline at end of file
diff --git a/demo/src/app/components/+popover/demos/adaptive-position/adaptive-position.ts b/demo/src/app/components/+popover/demos/adaptive-position/adaptive-position.ts
new file mode 100644
index 0000000000..5024cb5467
--- /dev/null
+++ b/demo/src/app/components/+popover/demos/adaptive-position/adaptive-position.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'demo-popover-adaptive-position',
+  templateUrl: './adaptive-position.html'
+})
+export class DemoPopoverAdaptivePositionComponent {}
diff --git a/demo/src/app/components/+popover/demos/index.ts b/demo/src/app/components/+popover/demos/index.ts
index 055df889ba..304265f714 100644
--- a/demo/src/app/components/+popover/demos/index.ts
+++ b/demo/src/app/components/+popover/demos/index.ts
@@ -1,37 +1,39 @@
+import { DemoPopoverAdaptivePositionComponent } from './adaptive-position/adaptive-position';
 import { DemoPopoverBasicComponent } from './basic/basic';
-import { DemoPopoverPlacementComponent } from './placement/placement';
+import { DemoPopoverByIsOpenPropComponent } from './trigger-by-isopen-property/trigger-by-isopen-property';
+import { DemoPopoverClassComponent } from './class/class';
+import { DemoPopoverConfigComponent } from './config/config';
+import { DemoPopoverContainerComponent } from './container/container';
+import { DemoPopoverContextComponent } from './popover-context/popover-context';
+import { DemoPopoverCustomContentComponent } from './custom-content/custom-content';
 import { DemoPopoverDismissComponent } from './dismiss/dismiss';
 import { DemoPopoverDynamicComponent } from './dynamic/dynamic';
-import { DemoPopoverCustomContentComponent } from './custom-content/custom-content';
 import { DemoPopoverDynamicHtmlComponent } from './dynamic-html/dynamic-html';
-import { DemoPopoverContainerComponent } from './container/container';
-import { DemoPopoverConfigComponent } from './config/config';
+import { DemoPopoverEventsComponent } from './events/events';
+import { DemoPopoverOutsideClickComponent } from './outside-click/outside-click';
+import { DemoPopoverPlacementComponent } from './placement/placement';
 import { DemoPopoverStylingGlobalComponent } from './styling-global/styling-global';
 import { DemoPopoverStylingLocalComponent } from './styling-local/styling-local';
 import { DemoPopoverTriggersCustomComponent } from './triggers-custom/triggers-custom';
 import { DemoPopoverTriggersManualComponent } from './triggers-manual/triggers-manual';
-import { DemoPopoverByIsOpenPropComponent } from './trigger-by-isopen-property/trigger-by-isopen-property';
-import { DemoPopoverClassComponent } from './class/class';
-import { DemoPopoverOutsideClickComponent } from './outside-click/outside-click';
-import { DemoPopoverEventsComponent } from './events/events';
-import { DemoPopoverContextComponent } from './popover-context/popover-context';
 
 export const DEMO_COMPONENTS = [
+  DemoPopoverAdaptivePositionComponent,
   DemoPopoverBasicComponent,
-  DemoPopoverPlacementComponent,
+  DemoPopoverByIsOpenPropComponent,
+  DemoPopoverClassComponent,
+  DemoPopoverConfigComponent,
+  DemoPopoverContainerComponent,
+  DemoPopoverContextComponent,
+  DemoPopoverCustomContentComponent,
   DemoPopoverDismissComponent,
   DemoPopoverDynamicComponent,
-  DemoPopoverCustomContentComponent,
   DemoPopoverDynamicHtmlComponent,
-  DemoPopoverContainerComponent,
-  DemoPopoverConfigComponent,
+  DemoPopoverEventsComponent,
+  DemoPopoverOutsideClickComponent,
+  DemoPopoverPlacementComponent,
   DemoPopoverStylingGlobalComponent,
   DemoPopoverStylingLocalComponent,
   DemoPopoverTriggersCustomComponent,
-  DemoPopoverTriggersManualComponent,
-  DemoPopoverByIsOpenPropComponent,
-  DemoPopoverClassComponent,
-  DemoPopoverOutsideClickComponent,
-  DemoPopoverEventsComponent,
-  DemoPopoverContextComponent
+  DemoPopoverTriggersManualComponent
 ];
diff --git a/demo/src/app/components/+popover/popover-section.list.ts b/demo/src/app/components/+popover/popover-section.list.ts
index da17c2e6a7..39874cb210 100644
--- a/demo/src/app/components/+popover/popover-section.list.ts
+++ b/demo/src/app/components/+popover/popover-section.list.ts
@@ -1,20 +1,20 @@
+import { DemoPopoverAdaptivePositionComponent } from './demos/adaptive-position/adaptive-position';
 import { DemoPopoverBasicComponent } from './demos/basic/basic';
-import { DemoPopoverPlacementComponent } from './demos/placement/placement';
+import { DemoPopoverByIsOpenPropComponent } from './demos/trigger-by-isopen-property/trigger-by-isopen-property';
+import { DemoPopoverClassComponent } from './demos/class/class';
+import { DemoPopoverConfigComponent } from './demos/config/config';
+import { DemoPopoverContainerComponent } from './demos/container/container';
+import { DemoPopoverContextComponent } from './demos/popover-context/popover-context';
+import { DemoPopoverCustomContentComponent } from './demos/custom-content/custom-content';
 import { DemoPopoverDismissComponent } from './demos/dismiss/dismiss';
 import { DemoPopoverDynamicComponent } from './demos/dynamic/dynamic';
-import { DemoPopoverCustomContentComponent } from './demos/custom-content/custom-content';
 import { DemoPopoverDynamicHtmlComponent } from './demos/dynamic-html/dynamic-html';
-import { DemoPopoverContainerComponent } from './demos/container/container';
-import { DemoPopoverConfigComponent } from './demos/config/config';
+import { DemoPopoverEventsComponent } from './demos/events/events';
 import { DemoPopoverOutsideClickComponent } from './demos/outside-click/outside-click';
+import { DemoPopoverPlacementComponent } from './demos/placement/placement';
+import { DemoPopoverStylingLocalComponent } from './demos/styling-local/styling-local';
 import { DemoPopoverTriggersCustomComponent } from './demos/triggers-custom/triggers-custom';
 import { DemoPopoverTriggersManualComponent } from './demos/triggers-manual/triggers-manual';
-import { DemoPopoverByIsOpenPropComponent } from './demos/trigger-by-isopen-property/trigger-by-isopen-property';
-import { DemoPopoverStylingLocalComponent } from './demos/styling-local/styling-local';
-import { DemoPopoverClassComponent } from './demos/class/class';
-import { DemoPopoverContextComponent } from './demos/popover-context/popover-context';
-import { DemoPopoverStylingGlobalComponent } from './demos/styling-global/styling-global';
-import { DemoPopoverEventsComponent } from './demos/events/events';
 
 import { ContentSection } from '../../docs/models/content-section.model';
 import { DemoTopSectionComponent } from '../../docs/demo-section-components/demo-top-section/index';
@@ -57,6 +57,16 @@ export const demoComponentContent: ContentSection[] = [
         Besides that, <code>auto</code> option may be used to detect a position that fits the component on screen.</p>`,
         outlet: DemoPopoverPlacementComponent
       },
+      {
+        title: 'Disable adaptive position',
+        anchor: 'adaptive-position',
+        description: `
+          <p>You can disable adaptive position via <code>adaptivePosition</code> input or config option</p>
+        `,
+        component: require('!!raw-loader?lang=typescript!./demos/adaptive-position/adaptive-position.ts'),
+        html: require('!!raw-loader?lang=markup!./demos/adaptive-position/adaptive-position.html'),
+        outlet: DemoPopoverAdaptivePositionComponent
+      },
       {
         title: 'Dismiss on next click',
         anchor: 'popover-dismiss',
@@ -167,14 +177,7 @@ export const demoComponentContent: ContentSection[] = [
         component: require('!!raw-loader?lang=typescript!./demos/popover-context/popover-context.ts'),
         html: require('!!raw-loader?lang=markup!./demos/popover-context/popover-context.html'),
         outlet: DemoPopoverContextComponent
-      }/*,
-      {
-        title: 'Global styling',
-        anchor: 'styling-global',
-        component: require('!!raw-loader?lang=typescript!./demos/styling-global/styling-global.ts'),
-        html: require('!!raw-loader?lang=markup!./demos/styling-global/styling-global.html'),
-        outlet: DemoPopoverStylingGlobalComponent
-      }*/
+      }
     ]
   },
   {
diff --git a/demo/src/app/components/+tooltip/demos/index.ts b/demo/src/app/components/+tooltip/demos/index.ts
index b066405a7f..dccf1739d3 100644
--- a/demo/src/app/components/+tooltip/demos/index.ts
+++ b/demo/src/app/components/+tooltip/demos/index.ts
@@ -1,31 +1,31 @@
 import { DemoTooltipBasicComponent } from './basic/basic';
-import { DemoTooltipPlacementComponent } from './placement/placement';
-import { DemoTooltipDismissComponent } from './dismiss/dismiss';
-import { DemoTooltipDynamicComponent } from './dynamic/dynamic';
+import { DemoTooltipClassComponent } from './class/class';
 import { DemoTooltipConfigComponent } from './config/config';
 import { DemoTooltipContainerComponent } from './container/container';
+import { DemoTooltipCustomContentComponent } from './custom-content/custom-content';
+import { DemoTooltipDelayComponent } from './delay/delay';
+import { DemoTooltipDismissComponent } from './dismiss/dismiss';
+import { DemoTooltipDynamicComponent } from './dynamic/dynamic';
+import { DemoTooltipDynamicHtmlComponent } from './dynamic-html/dynamic-html';
+import { DemoTooltipPlacementComponent } from './placement/placement';
 import { DemoTooltipStylingGlobalComponent } from './styling-global/styling-global';
 import { DemoTooltipStylingLocalComponent } from './styling-local/styling-local';
 import { DemoTooltipTriggersCustomComponent } from './triggers-custom/triggers-custom';
 import { DemoTooltipTriggersManualComponent } from './triggers-manual/triggers-manual';
-import { DemoTooltipDynamicHtmlComponent } from './dynamic-html/dynamic-html';
-import { DemoTooltipClassComponent } from './class/class';
-import { DemoTooltipDelayComponent } from './delay/delay';
-import { DemoTooltipCustomContentComponent } from './custom-content/custom-content';
 
 export const DEMO_COMPONENTS = [
   DemoTooltipBasicComponent,
-  DemoTooltipPlacementComponent,
-  DemoTooltipDismissComponent,
+  DemoTooltipClassComponent,
+  DemoTooltipConfigComponent,
+  DemoTooltipContainerComponent,
   DemoTooltipCustomContentComponent,
+  DemoTooltipDelayComponent,
+  DemoTooltipDismissComponent,
   DemoTooltipDynamicComponent,
   DemoTooltipDynamicHtmlComponent,
-  DemoTooltipContainerComponent,
-  DemoTooltipConfigComponent,
+  DemoTooltipPlacementComponent,
   DemoTooltipStylingGlobalComponent,
   DemoTooltipStylingLocalComponent,
   DemoTooltipTriggersCustomComponent,
-  DemoTooltipTriggersManualComponent,
-  DemoTooltipClassComponent,
-  DemoTooltipDelayComponent
+  DemoTooltipTriggersManualComponent
 ];
diff --git a/demo/src/app/components/+tooltip/tooltip-section.list.ts b/demo/src/app/components/+tooltip/tooltip-section.list.ts
index 223bff5a38..46186c994f 100644
--- a/demo/src/app/components/+tooltip/tooltip-section.list.ts
+++ b/demo/src/app/components/+tooltip/tooltip-section.list.ts
@@ -1,15 +1,16 @@
 import { DemoTooltipBasicComponent } from './demos/basic/basic';
-import { DemoTooltipPlacementComponent } from './demos/placement/placement';
+import { DemoTooltipClassComponent } from './demos/class/class';
+import { DemoTooltipConfigComponent } from './demos/config/config';
+import { DemoTooltipContainerComponent } from './demos/container/container';
+import { DemoTooltipCustomContentComponent } from './demos/custom-content/custom-content';
+import { DemoTooltipDelayComponent } from './demos/delay/delay';
 import { DemoTooltipDismissComponent } from './demos/dismiss/dismiss';
 import { DemoTooltipDynamicComponent } from './demos/dynamic/dynamic';
 import { DemoTooltipDynamicHtmlComponent } from './demos/dynamic-html/dynamic-html';
-import { DemoTooltipContainerComponent } from './demos/container/container';
-import { DemoTooltipConfigComponent } from './demos/config/config';
+import { DemoTooltipPlacementComponent } from './demos/placement/placement';
+import { DemoTooltipStylingLocalComponent } from './demos/styling-local/styling-local';
 import { DemoTooltipTriggersCustomComponent } from './demos/triggers-custom/triggers-custom';
 import { DemoTooltipTriggersManualComponent } from './demos/triggers-manual/triggers-manual';
-import { DemoTooltipStylingLocalComponent } from './demos/styling-local/styling-local';
-import { DemoTooltipClassComponent } from './demos/class/class';
-import { DemoTooltipStylingGlobalComponent } from './demos/styling-global/styling-global';
 
 import { ContentSection } from '../../docs/models/content-section.model';
 import { DemoTopSectionComponent } from '../../docs/demo-section-components/demo-top-section/index';
@@ -20,8 +21,6 @@ import {
   NgApiDocComponent,
   NgApiDocConfigComponent
 } from '../../docs/api-docs';
-import { DemoTooltipDelayComponent } from './demos/delay/delay';
-import { DemoTooltipCustomContentComponent } from './demos/custom-content/custom-content';
 
 export const demoComponentContent: ContentSection[] = [
   {
diff --git a/demo/src/app/components/+typeahead/demos/adaptive-position/adaptive-position.html b/demo/src/app/components/+typeahead/demos/adaptive-position/adaptive-position.html
index 4cc790c992..168adb1690 100644
--- a/demo/src/app/components/+typeahead/demos/adaptive-position/adaptive-position.html
+++ b/demo/src/app/components/+typeahead/demos/adaptive-position/adaptive-position.html
@@ -1,5 +1,5 @@
 <pre class="card card-block card-header mb-3">Model: {{selected | json}}</pre>
 <input [(ngModel)]="selected"
        [typeahead]="states"
-       adaptivePosition="true"
+       [adaptivePosition]="true"
        class="form-control">
\ No newline at end of file
diff --git a/demo/src/ng-api-doc.ts b/demo/src/ng-api-doc.ts
index b0829ad275..e158186b8f 100644
--- a/demo/src/ng-api-doc.ts
+++ b/demo/src/ng-api-doc.ts
@@ -9,17 +9,17 @@ export const ngdoc: any = {
       {
         "name": "heading",
         "type": "string",
-        "description": "<p>Clickable text in accordion&#39;s group header, check <code>accordion heading</code> below for using html in header </p>\n"
+        "description": "<p>Clickable text in accordion&#39;s group header, check <code>accordion heading</code> below for using html in header</p>\n"
       },
       {
         "name": "isDisabled",
         "type": "boolean",
-        "description": "<p>if <code>true</code> — disables accordion group </p>\n"
+        "description": "<p>if <code>true</code> — disables accordion group</p>\n"
       },
       {
         "name": "isOpen",
         "type": "boolean",
-        "description": "<p>Is accordion group open or closed. This property supports two-way binding </p>\n"
+        "description": "<p>Is accordion group open or closed. This property supports two-way binding</p>\n"
       },
       {
         "name": "panelClass",
@@ -30,7 +30,7 @@ export const ngdoc: any = {
     "outputs": [
       {
         "name": "isOpenChange",
-        "description": "<p>Emits when the opened state changes </p>\n"
+        "description": "<p>Emits when the opened state changes</p>\n"
       }
     ],
     "properties": [
@@ -38,7 +38,7 @@ export const ngdoc: any = {
         "name": "isAnimated",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>turn on/off animation </p>\n"
+        "description": "<p>turn on/off animation</p>\n"
       }
     ],
     "methods": []
@@ -46,19 +46,19 @@ export const ngdoc: any = {
   "AccordionComponent": {
     "fileName": "src/accordion/accordion.component.ts",
     "className": "AccordionComponent",
-    "description": "<p>Displays collapsible content panels for presenting information in a limited amount of space. </p>\n",
+    "description": "<p>Displays collapsible content panels for presenting information in a limited amount of space.</p>\n",
     "selector": "accordion",
     "inputs": [
       {
         "name": "closeOthers",
         "type": "boolean",
-        "description": "<p>if <code>true</code> expanding one item will close all others </p>\n"
+        "description": "<p>if <code>true</code> expanding one item will close all others</p>\n"
       },
       {
         "name": "isAnimated",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>turn on/off animation </p>\n"
+        "description": "<p>turn on/off animation</p>\n"
       }
     ],
     "outputs": [],
@@ -75,13 +75,13 @@ export const ngdoc: any = {
         "name": "closeOthers",
         "defaultValue": "false",
         "type": "Boolean",
-        "description": "<p>Whether the other panels should be closed when a panel is opened </p>\n"
+        "description": "<p>Whether the other panels should be closed when a panel is opened</p>\n"
       },
       {
         "name": "isAnimated",
         "defaultValue": "false",
         "type": "Boolean",
-        "description": "<p>turn on/off animation </p>\n"
+        "description": "<p>turn on/off animation</p>\n"
       }
     ]
   },
@@ -95,18 +95,18 @@ export const ngdoc: any = {
         "name": "dismissible",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>If set, displays an inline &quot;Close&quot; button </p>\n"
+        "description": "<p>If set, displays an inline &quot;Close&quot; button</p>\n"
       },
       {
         "name": "dismissOnTimeout",
         "type": "string | number",
-        "description": "<p>Number in milliseconds, after which alert will be closed </p>\n"
+        "description": "<p>Number in milliseconds, after which alert will be closed</p>\n"
       },
       {
         "name": "isOpen",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>Is alert visible </p>\n"
+        "description": "<p>Is alert visible</p>\n"
       },
       {
         "name": "type",
@@ -122,7 +122,7 @@ export const ngdoc: any = {
       },
       {
         "name": "onClosed",
-        "description": "<p>This event fires when alert closed, $event is an instance of Alert component </p>\n"
+        "description": "<p>This event fires when alert closed, $event is an instance of Alert component</p>\n"
       }
     ],
     "properties": [],
@@ -145,19 +145,19 @@ export const ngdoc: any = {
         "name": "dismissible",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>is alerts are dismissible by default </p>\n"
+        "description": "<p>is alerts are dismissible by default</p>\n"
       },
       {
         "name": "dismissOnTimeout",
         "defaultValue": "undefined",
         "type": "number",
-        "description": "<p>default time before alert will dismiss </p>\n"
+        "description": "<p>default time before alert will dismiss</p>\n"
       },
       {
         "name": "type",
         "defaultValue": "warning",
         "type": "string",
-        "description": "<p>default alert type </p>\n"
+        "description": "<p>default alert type</p>\n"
       }
     ]
   },
@@ -171,13 +171,13 @@ export const ngdoc: any = {
         "name": "btnCheckboxFalse",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>Falsy value, will be set to ngModel </p>\n"
+        "description": "<p>Falsy value, will be set to ngModel</p>\n"
       },
       {
         "name": "btnCheckboxTrue",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>Truthy value, will be set to ngModel </p>\n"
+        "description": "<p>Truthy value, will be set to ngModel</p>\n"
       }
     ],
     "outputs": [],
@@ -203,22 +203,22 @@ export const ngdoc: any = {
       {
         "name": "btnRadio",
         "type": "string",
-        "description": "<p>Radio button value, will be set to <code>ngModel</code> </p>\n"
+        "description": "<p>Radio button value, will be set to <code>ngModel</code></p>\n"
       },
       {
         "name": "disabled",
         "type": "boolean",
-        "description": "<p>If <code>true</code> — radio button is disabled </p>\n"
+        "description": "<p>If <code>true</code> — radio button is disabled</p>\n"
       },
       {
         "name": "uncheckable",
         "type": "boolean",
-        "description": "<p>If <code>true</code> — radio button can be unchecked </p>\n"
+        "description": "<p>If <code>true</code> — radio button can be unchecked</p>\n"
       },
       {
         "name": "value",
         "type": "string",
-        "description": "<p>Current value of radio component or group </p>\n"
+        "description": "<p>Current value of radio component or group</p>\n"
       }
     ],
     "outputs": [],
@@ -234,7 +234,7 @@ export const ngdoc: any = {
       {
         "name": "activeSlide",
         "type": "number",
-        "description": "<p>Index of currently displayed slide(started for 0) </p>\n"
+        "description": "<p>Index of currently displayed slide(started for 0)</p>\n"
       },
       {
         "name": "interval",
@@ -278,18 +278,18 @@ export const ngdoc: any = {
     "outputs": [
       {
         "name": "activeSlideChange",
-        "description": "<p>Will be emitted when active slide has been changed. Part of two-way-bindable [(activeSlide)] property </p>\n"
+        "description": "<p>Will be emitted when active slide has been changed. Part of two-way-bindable [(activeSlide)] property</p>\n"
       },
       {
         "name": "slideRangeChange",
-        "description": "<p>Will be emitted when active slides has been changed in multilist mode </p>\n"
+        "description": "<p>Will be emitted when active slides has been changed in multilist mode</p>\n"
       }
     ],
     "properties": [
       {
         "name": "activeSlide",
         "type": "number",
-        "description": "<p>Index of currently displayed slide(started for 0) </p>\n"
+        "description": "<p>Index of currently displayed slide(started for 0)</p>\n"
       }
     ],
     "methods": [
@@ -438,25 +438,25 @@ export const ngdoc: any = {
         "name": "interval",
         "defaultValue": "5000",
         "type": "number",
-        "description": "<p>Default interval of auto changing of slides </p>\n"
+        "description": "<p>Default interval of auto changing of slides</p>\n"
       },
       {
         "name": "noPause",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>Is loop of auto changing of slides can be paused </p>\n"
+        "description": "<p>Is loop of auto changing of slides can be paused</p>\n"
       },
       {
         "name": "noWrap",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>Is slides can wrap from the last to the first slide </p>\n"
+        "description": "<p>Is slides can wrap from the last to the first slide</p>\n"
       },
       {
         "name": "showIndicators",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>Show carousel-indicators </p>\n"
+        "description": "<p>Show carousel-indicators</p>\n"
       }
     ]
   },
@@ -483,7 +483,7 @@ export const ngdoc: any = {
       {
         "name": "active",
         "type": "boolean",
-        "description": "<p>Is current slide active </p>\n"
+        "description": "<p>Is current slide active</p>\n"
       }
     ],
     "outputs": [],
@@ -492,12 +492,12 @@ export const ngdoc: any = {
         "name": "addClass",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>Wraps element by appropriate CSS classes </p>\n"
+        "description": "<p>Wraps element by appropriate CSS classes</p>\n"
       },
       {
         "name": "carousel",
         "type": "CarouselComponent",
-        "description": "<p>Link to Parent(container-collection) component </p>\n"
+        "description": "<p>Link to Parent(container-collection) component</p>\n"
       }
     ],
     "methods": []
@@ -511,82 +511,82 @@ export const ngdoc: any = {
       {
         "name": "_a",
         "type": "number[]",
-        "description": "<p>DateArray [year, month, date, .....] </p>\n"
+        "description": "<p>DateArray [year, month, date, .....]</p>\n"
       },
       {
         "name": "_changeInProgress",
         "type": "boolean",
-        "description": "<p>used in set offset </p>\n"
+        "description": "<p>used in set offset</p>\n"
       },
       {
         "name": "_d",
         "type": "Date",
-        "description": "<p>date value </p>\n"
+        "description": "<p>date value</p>\n"
       },
       {
         "name": "_f",
         "type": "string | string[]",
-        "description": "<p>date format </p>\n"
+        "description": "<p>date format</p>\n"
       },
       {
         "name": "_i",
         "type": "DateInput",
-        "description": "<p>input to parse: could be string, number[], number, Date, object </p>\n"
+        "description": "<p>input to parse: could be string, number[], number, Date, object</p>\n"
       },
       {
         "name": "_isPm",
         "type": "boolean",
-        "description": "<p>is PM </p>\n"
+        "description": "<p>is PM</p>\n"
       },
       {
         "name": "_isValid",
         "type": "boolean",
-        "description": "<p>is valid </p>\n"
+        "description": "<p>is valid</p>\n"
       },
       {
         "name": "_l",
         "type": "string",
-        "description": "<p>locale key, &#39;en&#39; by default </p>\n"
+        "description": "<p>locale key, &#39;en&#39; by default</p>\n"
       },
       {
         "name": "_locale",
         "type": "Locale",
-        "description": "<p>date locale obj </p>\n"
+        "description": "<p>date locale obj</p>\n"
       },
       {
         "name": "_meridiem",
         "type": "string",
-        "description": "<p>date meridiem </p>\n"
+        "description": "<p>date meridiem</p>\n"
       },
       {
         "name": "_nextDay",
         "type": "boolean",
-        "description": "<p>add one day to result at the end of parsing </p>\n"
+        "description": "<p>add one day to result at the end of parsing</p>\n"
       },
       {
         "name": "_offset",
         "type": "number",
-        "description": "<p>utc time offset </p>\n"
+        "description": "<p>utc time offset</p>\n"
       },
       {
         "name": "_pf",
         "type": "DateParsingFlags",
-        "description": "<p>date parsing flags </p>\n"
+        "description": "<p>date parsing flags</p>\n"
       },
       {
         "name": "_strict",
         "type": "boolean",
-        "description": "<p>use strict parse format </p>\n"
+        "description": "<p>use strict parse format</p>\n"
       },
       {
         "name": "_tzm",
         "type": "number",
-        "description": "<p>time zone </p>\n"
+        "description": "<p>time zone</p>\n"
       },
       {
         "name": "_w",
         "type": "WeekParsing",
-        "description": "<p>date specific info \nweek </p>\n"
+        "description": "<p>date specific info\nweek</p>\n"
       }
     ]
   },
@@ -670,7 +670,7 @@ export const ngdoc: any = {
       {
         "name": "collapse",
         "type": "boolean",
-        "description": "<p>A flag indicating visibility of content (shown or hidden) </p>\n"
+        "description": "<p>A flag indicating visibility of content (shown or hidden)</p>\n"
       },
       {
         "name": "display",
@@ -681,50 +681,50 @@ export const ngdoc: any = {
         "name": "isAnimated",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>turn on/off animation </p>\n"
+        "description": "<p>turn on/off animation</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "collapsed",
-        "description": "<p>This event fires as soon as content collapses </p>\n"
+        "description": "<p>This event fires as soon as content collapses</p>\n"
       },
       {
         "name": "collapses",
-        "description": "<p>This event fires when collapsing is started </p>\n"
+        "description": "<p>This event fires when collapsing is started</p>\n"
       },
       {
         "name": "expanded",
-        "description": "<p>This event fires as soon as content becomes visible </p>\n"
+        "description": "<p>This event fires as soon as content becomes visible</p>\n"
       },
       {
         "name": "expands",
-        "description": "<p>This event fires when expansion is started </p>\n"
+        "description": "<p>This event fires when expansion is started</p>\n"
       }
     ],
     "properties": [
       {
         "name": "collapse",
         "type": "boolean",
-        "description": "<p>A flag indicating visibility of content (shown or hidden) </p>\n"
+        "description": "<p>A flag indicating visibility of content (shown or hidden)</p>\n"
       }
     ],
     "methods": [
       {
         "name": "toggle",
-        "description": "<p>allows to manually toggle content visibility </p>\n",
+        "description": "<p>allows to manually toggle content visibility</p>\n",
         "args": [],
         "returnType": "void"
       },
       {
         "name": "hide",
-        "description": "<p>allows to manually hide content </p>\n",
+        "description": "<p>allows to manually hide content</p>\n",
         "args": [],
         "returnType": "void"
       },
       {
         "name": "show",
-        "description": "<p>allows to manually show collapsed content </p>\n",
+        "description": "<p>allows to manually show collapsed content</p>\n",
         "args": [],
         "returnType": "void"
       }
@@ -950,7 +950,7 @@ export const ngdoc: any = {
         "name": "adaptivePosition",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>sets use adaptive position </p>\n"
+        "description": "<p>sets use adaptive position</p>\n"
       },
       {
         "name": "containerClass",
@@ -1299,125 +1299,125 @@ export const ngdoc: any = {
       {
         "name": "activeDate",
         "type": "Date",
-        "description": "<p>currently active date </p>\n"
+        "description": "<p>currently active date</p>\n"
       },
       {
         "name": "customClass",
         "type": "{ date: Date; mode: string; clazz: string; }[]",
-        "description": "<p>array of custom css classes to be applied to targeted dates </p>\n"
+        "description": "<p>array of custom css classes to be applied to targeted dates</p>\n"
       },
       {
         "name": "dateDisabled",
         "type": "{ date: Date; mode: string; }[]",
-        "description": "<p>array of disabled dates </p>\n"
+        "description": "<p>array of disabled dates</p>\n"
       },
       {
         "name": "datepickerMode",
         "defaultValue": "day",
         "type": "string",
-        "description": "<p>sets datepicker mode, supports: <code>day</code>, <code>month</code>, <code>year</code> </p>\n"
+        "description": "<p>sets datepicker mode, supports: <code>day</code>, <code>month</code>, <code>year</code></p>\n"
       },
       {
         "name": "dayDisabled",
         "type": "number[]",
-        "description": "<p>disabled days of the week from 0-6 (0=Sunday, ..., 6=Saturday) </p>\n"
+        "description": "<p>disabled days of the week from 0-6 (0=Sunday, ..., 6=Saturday)</p>\n"
       },
       {
         "name": "formatDay",
         "type": "string",
-        "description": "<p>format of day in month </p>\n"
+        "description": "<p>format of day in month</p>\n"
       },
       {
         "name": "formatDayHeader",
         "type": "string",
-        "description": "<p>format of day in week header </p>\n"
+        "description": "<p>format of day in week header</p>\n"
       },
       {
         "name": "formatDayTitle",
         "type": "string",
-        "description": "<p>format of title when selecting day </p>\n"
+        "description": "<p>format of title when selecting day</p>\n"
       },
       {
         "name": "formatMonth",
         "type": "string",
-        "description": "<p>format of month in year </p>\n"
+        "description": "<p>format of month in year</p>\n"
       },
       {
         "name": "formatMonthTitle",
         "type": "string",
-        "description": "<p>format of title when selecting month </p>\n"
+        "description": "<p>format of title when selecting month</p>\n"
       },
       {
         "name": "formatYear",
         "type": "string",
-        "description": "<p>format of year in year range </p>\n"
+        "description": "<p>format of year in year range</p>\n"
       },
       {
         "name": "initDate",
         "type": "Date",
-        "description": "<p>default date to show if <code>ng-model</code> value is not specified </p>\n"
+        "description": "<p>default date to show if <code>ng-model</code> value is not specified</p>\n"
       },
       {
         "name": "maxDate",
         "type": "Date",
-        "description": "<p>latest selectable date </p>\n"
+        "description": "<p>latest selectable date</p>\n"
       },
       {
         "name": "maxMode",
         "type": "string",
-        "description": "<p>sets upper datepicker mode, supports: <code>day</code>, <code>month</code>, <code>year</code> </p>\n"
+        "description": "<p>sets upper datepicker mode, supports: <code>day</code>, <code>month</code>, <code>year</code></p>\n"
       },
       {
         "name": "minDate",
         "type": "Date",
-        "description": "<p>oldest selectable date </p>\n"
+        "description": "<p>oldest selectable date</p>\n"
       },
       {
         "name": "minMode",
         "type": "string",
-        "description": "<p>set lower datepicker mode, supports: <code>day</code>, <code>month</code>, <code>year</code> </p>\n"
+        "description": "<p>set lower datepicker mode, supports: <code>day</code>, <code>month</code>, <code>year</code></p>\n"
       },
       {
         "name": "monthColLimit",
         "type": "number",
-        "description": "<p>number of months displayed in a single row of month picker </p>\n"
+        "description": "<p>number of months displayed in a single row of month picker</p>\n"
       },
       {
         "name": "onlyCurrentMonth",
         "type": "boolean",
-        "description": "<p>if true only dates from the currently displayed month will be shown </p>\n"
+        "description": "<p>if true only dates from the currently displayed month will be shown</p>\n"
       },
       {
         "name": "shortcutPropagation",
         "type": "boolean",
-        "description": "<p>if true shortcut`s event propagation will be disabled </p>\n"
+        "description": "<p>if true shortcut`s event propagation will be disabled *</p>\n"
       },
       {
         "name": "showWeeks",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>if false week numbers will be hidden </p>\n"
+        "description": "<p>if false week numbers will be hidden</p>\n"
       },
       {
         "name": "startingDay",
         "type": "number",
-        "description": "<p>starting day of the week from 0-6 (0=Sunday, ..., 6=Saturday) </p>\n"
+        "description": "<p>starting day of the week from 0-6 (0=Sunday, ..., 6=Saturday)</p>\n"
       },
       {
         "name": "yearColLimit",
         "type": "number",
-        "description": "<p>number of years displayed in a single row of year picker </p>\n"
+        "description": "<p>number of years displayed in a single row of year picker</p>\n"
       },
       {
         "name": "yearRange",
         "type": "number",
-        "description": "<p>number of years displayed in year selection </p>\n"
+        "description": "<p>number of years displayed in year selection</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "activeDateChange",
-        "description": "<p>callback to invoke when the activeDate is changed. </p>\n"
+        "description": "<p>callback to invoke when the activeDate is changed.</p>\n"
       },
       {
         "name": "selectionDone",
@@ -1587,7 +1587,7 @@ export const ngdoc: any = {
     "methods": [
       {
         "name": "setValue",
-        "description": "<p>setters </p>\n",
+        "description": "<p>setters</p>\n",
         "args": [
           {
             "name": "value",
@@ -1598,7 +1598,7 @@ export const ngdoc: any = {
       },
       {
         "name": "setBindings",
-        "description": "<p>view to mode bindings </p>\n",
+        "description": "<p>view to mode bindings</p>\n",
         "args": [
           {
             "name": "container",
@@ -1609,7 +1609,7 @@ export const ngdoc: any = {
       },
       {
         "name": "setEventHandlers",
-        "description": "<p>event handlers </p>\n",
+        "description": "<p>event handlers</p>\n",
         "args": [
           {
             "name": "container",
@@ -1930,20 +1930,20 @@ export const ngdoc: any = {
   "BsDropdownConfig": {
     "fileName": "src/dropdown/bs-dropdown.config.ts",
     "className": "BsDropdownConfig",
-    "description": "<p>Default dropdown configuration </p>\n",
+    "description": "<p>Default dropdown configuration</p>\n",
     "methods": [],
     "properties": [
       {
         "name": "autoClose",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>default dropdown auto closing behavior </p>\n"
+        "description": "<p>default dropdown auto closing behavior</p>\n"
       },
       {
         "name": "insideClick",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>default dropdown auto closing behavior </p>\n"
+        "description": "<p>default dropdown auto closing behavior</p>\n"
       }
     ]
   },
@@ -2104,7 +2104,7 @@ export const ngdoc: any = {
     "methods": [
       {
         "name": "show",
-        "description": "<p>Shows a modal </p>\n",
+        "description": "<p>Shows a modal</p>\n",
         "args": [
           {
             "name": "content",
@@ -2119,7 +2119,7 @@ export const ngdoc: any = {
       },
       {
         "name": "checkScrollbar",
-        "description": "<p>AFTER PR MERGE MODAL.COMPONENT WILL BE USING THIS CODE \nScroll bar tricks </p>\n",
+        "description": "<p>AFTER PR MERGE MODAL.COMPONENT WILL BE USING THIS CODE\nScroll bar tricks</p>\n",
         "args": [],
         "returnType": "void"
       }
@@ -2129,7 +2129,7 @@ export const ngdoc: any = {
   "ModalBackdropComponent": {
     "fileName": "src/modal/modal-backdrop.component.ts",
     "className": "ModalBackdropComponent",
-    "description": "<p>This component will be added as background layout for modals if enabled </p>\n",
+    "description": "<p>This component will be added as background layout for modals if enabled</p>\n",
     "selector": "bs-modal-backdrop",
     "inputs": [],
     "outputs": [],
@@ -2192,14 +2192,14 @@ export const ngdoc: any = {
   "ModalDirective": {
     "fileName": "src/modal/modal.directive.ts",
     "className": "ModalDirective",
-    "description": "<p>Mark any code with directive to show it&#39;s content in modal </p>\n",
+    "description": "<p>Mark any code with directive to show it&#39;s content in modal</p>\n",
     "selector": "[bsModal]",
     "exportAs": "bs-modal",
     "inputs": [
       {
         "name": "config",
         "type": "ModalOptions",
-        "description": "<p>allows to set modal configuration via element property </p>\n"
+        "description": "<p>allows to set modal configuration via element property</p>\n"
       }
     ],
     "outputs": [
@@ -2213,7 +2213,7 @@ export const ngdoc: any = {
       },
       {
         "name": "onShow",
-        "description": "<p>This event fires immediately when the <code>show</code> instance method is called. </p>\n"
+        "description": "<p>This event fires immediately when the <code>show</code> instance method is called.</p>\n"
       },
       {
         "name": "onShown",
@@ -2224,7 +2224,7 @@ export const ngdoc: any = {
       {
         "name": "config",
         "type": "ModalOptions",
-        "description": "<p>allows to set modal configuration via element property </p>\n"
+        "description": "<p>allows to set modal configuration via element property</p>\n"
       },
       {
         "name": "dismissReason",
@@ -2235,19 +2235,19 @@ export const ngdoc: any = {
     "methods": [
       {
         "name": "toggle",
-        "description": "<p>Allows to manually toggle modal visibility </p>\n",
+        "description": "<p>Allows to manually toggle modal visibility</p>\n",
         "args": [],
         "returnType": "void"
       },
       {
         "name": "show",
-        "description": "<p>Allows to manually open modal </p>\n",
+        "description": "<p>Allows to manually open modal</p>\n",
         "args": [],
         "returnType": "void"
       },
       {
         "name": "hide",
-        "description": "<p>Allows to manually close modal </p>\n",
+        "description": "<p>Allows to manually close modal</p>\n",
         "args": [
           {
             "name": "event",
@@ -2264,13 +2264,13 @@ export const ngdoc: any = {
       },
       {
         "name": "focusOtherModal",
-        "description": "<p>Events tricks </p>\n",
+        "description": "<p>Events tricks</p>\n",
         "args": [],
         "returnType": "void"
       },
       {
         "name": "checkScrollbar",
-        "description": "<p>Scroll bar tricks </p>\n",
+        "description": "<p>Scroll bar tricks</p>\n",
         "args": [],
         "returnType": "void"
       }
@@ -2334,73 +2334,73 @@ export const ngdoc: any = {
       {
         "name": "align",
         "type": "boolean",
-        "description": "<p>if <code>true</code> aligns each link to the sides of pager </p>\n"
+        "description": "<p>if <code>true</code> aligns each link to the sides of pager</p>\n"
       },
       {
         "name": "boundaryLinks",
         "type": "boolean",
-        "description": "<p>if false first and last buttons will be hidden </p>\n"
+        "description": "<p>if false first and last buttons will be hidden</p>\n"
       },
       {
         "name": "directionLinks",
         "type": "boolean",
-        "description": "<p>if false previous and next buttons will be hidden </p>\n"
+        "description": "<p>if false previous and next buttons will be hidden</p>\n"
       },
       {
         "name": "disabled",
         "type": "boolean",
-        "description": "<p>if true pagination component will be disabled </p>\n"
+        "description": "<p>if true pagination component will be disabled</p>\n"
       },
       {
         "name": "firstText",
         "type": "string",
-        "description": "<p>first button text </p>\n"
+        "description": "<p>first button text</p>\n"
       },
       {
         "name": "itemsPerPage",
         "type": "number",
-        "description": "<p>maximum number of items per page. If value less than 1 will display all items on one page </p>\n"
+        "description": "<p>maximum number of items per page. If value less than 1 will display all items on one page</p>\n"
       },
       {
         "name": "lastText",
         "type": "string",
-        "description": "<p>last button text </p>\n"
+        "description": "<p>last button text</p>\n"
       },
       {
         "name": "maxSize",
         "type": "number",
-        "description": "<p>limit number for page links in pager </p>\n"
+        "description": "<p>limit number for page links in pager</p>\n"
       },
       {
         "name": "nextText",
         "type": "string",
-        "description": "<p>next button text </p>\n"
+        "description": "<p>next button text</p>\n"
       },
       {
         "name": "pageBtnClass",
         "type": "string",
-        "description": "<p>add class to <code>&lt;li></code> </p>\n"
+        "description": "<p>add class to <code>&lt;li></code></p>\n"
       },
       {
         "name": "previousText",
         "type": "string",
-        "description": "<p>previous button text </p>\n"
+        "description": "<p>previous button text</p>\n"
       },
       {
         "name": "rotate",
         "type": "boolean",
-        "description": "<p>if true current page will in the middle of pages list </p>\n"
+        "description": "<p>if true current page will in the middle of pages list</p>\n"
       },
       {
         "name": "totalItems",
         "type": "number",
-        "description": "<p>total number of items in all pages </p>\n"
+        "description": "<p>total number of items in all pages</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "numPages",
-        "description": "<p>fired when total pages count changes, $event:number equals to total pages count </p>\n"
+        "description": "<p>fired when total pages count changes, $event:number equals to total pages count</p>\n"
       },
       {
         "name": "pageChanged",
@@ -2426,73 +2426,73 @@ export const ngdoc: any = {
       {
         "name": "align",
         "type": "boolean",
-        "description": "<p>if <code>true</code> aligns each link to the sides of pager </p>\n"
+        "description": "<p>if <code>true</code> aligns each link to the sides of pager</p>\n"
       },
       {
         "name": "boundaryLinks",
         "type": "boolean",
-        "description": "<p>if false first and last buttons will be hidden </p>\n"
+        "description": "<p>if false first and last buttons will be hidden</p>\n"
       },
       {
         "name": "directionLinks",
         "type": "boolean",
-        "description": "<p>if false previous and next buttons will be hidden </p>\n"
+        "description": "<p>if false previous and next buttons will be hidden</p>\n"
       },
       {
         "name": "disabled",
         "type": "boolean",
-        "description": "<p>if true pagination component will be disabled </p>\n"
+        "description": "<p>if true pagination component will be disabled</p>\n"
       },
       {
         "name": "firstText",
         "type": "string",
-        "description": "<p>first button text </p>\n"
+        "description": "<p>first button text</p>\n"
       },
       {
         "name": "itemsPerPage",
         "type": "number",
-        "description": "<p>maximum number of items per page. If value less than 1 will display all items on one page </p>\n"
+        "description": "<p>maximum number of items per page. If value less than 1 will display all items on one page</p>\n"
       },
       {
         "name": "lastText",
         "type": "string",
-        "description": "<p>last button text </p>\n"
+        "description": "<p>last button text</p>\n"
       },
       {
         "name": "maxSize",
         "type": "number",
-        "description": "<p>limit number for page links in pager </p>\n"
+        "description": "<p>limit number for page links in pager</p>\n"
       },
       {
         "name": "nextText",
         "type": "string",
-        "description": "<p>next button text </p>\n"
+        "description": "<p>next button text</p>\n"
       },
       {
         "name": "pageBtnClass",
         "type": "string",
-        "description": "<p>add class to <code>&lt;li></code> </p>\n"
+        "description": "<p>add class to <code>&lt;li></code></p>\n"
       },
       {
         "name": "previousText",
         "type": "string",
-        "description": "<p>previous button text </p>\n"
+        "description": "<p>previous button text</p>\n"
       },
       {
         "name": "rotate",
         "type": "boolean",
-        "description": "<p>if true current page will in the middle of pages list </p>\n"
+        "description": "<p>if true current page will in the middle of pages list</p>\n"
       },
       {
         "name": "totalItems",
         "type": "number",
-        "description": "<p>total number of items in all pages </p>\n"
+        "description": "<p>total number of items in all pages</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "numPages",
-        "description": "<p>fired when total pages count changes, $event:number equals to total pages count </p>\n"
+        "description": "<p>fired when total pages count changes, $event:number equals to total pages count</p>\n"
       },
       {
         "name": "pageChanged",
@@ -2505,7 +2505,7 @@ export const ngdoc: any = {
   "PaginationConfig": {
     "fileName": "src/pagination/pagination.config.ts",
     "className": "PaginationConfig",
-    "description": "<p>Provides default values for Pagination and pager components </p>\n",
+    "description": "<p>Provides default values for Pagination and pager components</p>\n",
     "methods": [],
     "properties": []
   },
@@ -2536,6 +2536,12 @@ export const ngdoc: any = {
     "description": "<p>Configuration service for the Popover directive.\nYou can inject this service, typically in your root component, and customize\nthe values of its properties in order to provide default values for all the\npopovers used in the application.</p>\n",
     "methods": [],
     "properties": [
+      {
+        "name": "adaptivePosition",
+        "defaultValue": "true",
+        "type": "boolean",
+        "description": "<p>sets disable adaptive position</p>\n"
+      },
       {
         "name": "container",
         "type": "string",
@@ -2562,6 +2568,11 @@ export const ngdoc: any = {
     "selector": "[popover]",
     "exportAs": "bs-popover",
     "inputs": [
+      {
+        "name": "adaptivePosition",
+        "type": "boolean",
+        "description": "<p>sets disable adaptive position</p>\n"
+      },
       {
         "name": "container",
         "type": "string",
@@ -2671,7 +2682,7 @@ export const ngdoc: any = {
       {
         "name": "appendToBody",
         "type": "boolean",
-        "description": "<p>If true component will be attached to body </p>\n"
+        "description": "<p>If true component will be attached to body</p>\n"
       },
       {
         "name": "attachment",
@@ -2681,7 +2692,7 @@ export const ngdoc: any = {
       {
         "name": "element",
         "type": "string | HTMLElement | ElementRef<any>",
-        "description": "<p>The DOM element, ElementRef, or a selector string of an element which will be moved </p>\n"
+        "description": "<p>The DOM element, ElementRef, or a selector string of an element which will be moved</p>\n"
       },
       {
         "name": "offset",
@@ -2691,7 +2702,7 @@ export const ngdoc: any = {
       {
         "name": "target",
         "type": "string | HTMLElement | ElementRef<any>",
-        "description": "<p>The DOM element, ElementRef, or a selector string of an element which the element will be attached to  </p>\n"
+        "description": "<p>The DOM element, ElementRef, or a selector string of an element which the element will be attached to</p>\n"
       },
       {
         "name": "targetAttachment",
@@ -2701,7 +2712,7 @@ export const ngdoc: any = {
       {
         "name": "targetOffset",
         "type": "string",
-        "description": "<p>A string similar to <code>offset</code>, but referring to the offset of the target </p>\n"
+        "description": "<p>A string similar to <code>offset</code>, but referring to the offset of the target</p>\n"
       }
     ]
   },
@@ -2721,12 +2732,12 @@ export const ngdoc: any = {
       {
         "name": "type",
         "type": "string",
-        "description": "<p>provide one of the four supported contextual classes: <code>success</code>, <code>info</code>, <code>warning</code>, <code>danger</code> </p>\n"
+        "description": "<p>provide one of the four supported contextual classes: <code>success</code>, <code>info</code>, <code>warning</code>, <code>danger</code></p>\n"
       },
       {
         "name": "value",
         "type": "number",
-        "description": "<p>current value of progress bar </p>\n"
+        "description": "<p>current value of progress bar</p>\n"
       }
     ],
     "outputs": [],
@@ -2742,22 +2753,22 @@ export const ngdoc: any = {
       {
         "name": "animate",
         "type": "boolean",
-        "description": "<p>if <code>true</code> changing value of progress bar will be animated </p>\n"
+        "description": "<p>if <code>true</code> changing value of progress bar will be animated</p>\n"
       },
       {
         "name": "max",
         "type": "number",
-        "description": "<p>maximum total value of progress element </p>\n"
+        "description": "<p>maximum total value of progress element</p>\n"
       },
       {
         "name": "striped",
         "type": "boolean",
-        "description": "<p>If <code>true</code>, striped classes are applied </p>\n"
+        "description": "<p>If <code>true</code>, striped classes are applied</p>\n"
       },
       {
         "name": "type",
         "type": "string",
-        "description": "<p>provide one of the four supported contextual classes: <code>success</code>, <code>info</code>, <code>warning</code>, <code>danger</code> </p>\n"
+        "description": "<p>provide one of the four supported contextual classes: <code>success</code>, <code>info</code>, <code>warning</code>, <code>danger</code></p>\n"
       },
       {
         "name": "value",
@@ -2779,13 +2790,13 @@ export const ngdoc: any = {
         "name": "animate",
         "defaultValue": "false",
         "type": "Boolean",
-        "description": "<p>if <code>true</code> changing value of progress bar will be animated </p>\n"
+        "description": "<p>if <code>true</code> changing value of progress bar will be animated</p>\n"
       },
       {
         "name": "max",
         "defaultValue": "100",
         "type": "number",
-        "description": "<p>maximum total value of progress element </p>\n"
+        "description": "<p>maximum total value of progress element</p>\n"
       }
     ]
   },
@@ -2812,33 +2823,33 @@ export const ngdoc: any = {
       {
         "name": "customTemplate",
         "type": "TemplateRef<any>",
-        "description": "<p>custom template for icons </p>\n"
+        "description": "<p>custom template for icons</p>\n"
       },
       {
         "name": "max",
         "defaultValue": "5",
         "type": "number",
-        "description": "<p>number of icons </p>\n"
+        "description": "<p>number of icons</p>\n"
       },
       {
         "name": "readonly",
         "type": "boolean",
-        "description": "<p>if true will not react on any user events </p>\n"
+        "description": "<p>if true will not react on any user events</p>\n"
       },
       {
         "name": "titles",
         "type": "string[]",
-        "description": "<p>array of icons titles, default: ([&quot;one&quot;, &quot;two&quot;, &quot;three&quot;, &quot;four&quot;, &quot;five&quot;]) </p>\n"
+        "description": "<p>array of icons titles, default: ([&quot;one&quot;, &quot;two&quot;, &quot;three&quot;, &quot;four&quot;, &quot;five&quot;])</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "onHover",
-        "description": "<p>fired when icon selected, $event:number equals to selected rating </p>\n"
+        "description": "<p>fired when icon selected, $event:number equals to selected rating</p>\n"
       },
       {
         "name": "onLeave",
-        "description": "<p>fired when icon selected, $event:number equals to previous rating value </p>\n"
+        "description": "<p>fired when icon selected, $event:number equals to previous rating value</p>\n"
       }
     ],
     "properties": [],
@@ -2868,57 +2879,57 @@ export const ngdoc: any = {
       {
         "name": "fieldName",
         "type": "string",
-        "description": "<p>field name if input array consists of objects </p>\n"
+        "description": "<p>field name if input array consists of objects</p>\n"
       },
       {
         "name": "itemActiveClass",
         "type": "string",
-        "description": "<p>class name for active item </p>\n"
+        "description": "<p>class name for active item</p>\n"
       },
       {
         "name": "itemActiveStyle",
         "type": "{ [key: string]: string; }",
-        "description": "<p>style object for active item </p>\n"
+        "description": "<p>style object for active item</p>\n"
       },
       {
         "name": "itemClass",
         "type": "string",
-        "description": "<p>class name for item </p>\n"
+        "description": "<p>class name for item</p>\n"
       },
       {
         "name": "itemStyle",
         "type": "{ [key: string]: string; }",
-        "description": "<p>style object for item </p>\n"
+        "description": "<p>style object for item</p>\n"
       },
       {
         "name": "itemTemplate",
         "type": "TemplateRef<any>",
-        "description": "<p>used to specify a custom item template. Template variables: item and index; </p>\n"
+        "description": "<p>used to specify a custom item template. Template variables: item and index;</p>\n"
       },
       {
         "name": "placeholderClass",
         "type": "string",
-        "description": "<p>class name for placeholder </p>\n"
+        "description": "<p>class name for placeholder</p>\n"
       },
       {
         "name": "placeholderItem",
         "type": "string",
-        "description": "<p>placeholder item which will be shown if collection is empty </p>\n"
+        "description": "<p>placeholder item which will be shown if collection is empty</p>\n"
       },
       {
         "name": "placeholderStyle",
         "type": "{ [key: string]: string; }",
-        "description": "<p>style object for placeholder </p>\n"
+        "description": "<p>style object for placeholder</p>\n"
       },
       {
         "name": "wrapperClass",
         "type": "string",
-        "description": "<p>class name for items wrapper </p>\n"
+        "description": "<p>class name for items wrapper</p>\n"
       },
       {
         "name": "wrapperStyle",
         "type": "{ [key: string]: string; }",
-        "description": "<p>style object for items wrapper </p>\n"
+        "description": "<p>style object for items wrapper</p>\n"
       }
     ],
     "outputs": [
@@ -2956,7 +2967,7 @@ export const ngdoc: any = {
   "TabHeadingDirective": {
     "fileName": "src/tabs/tab-heading.directive.ts",
     "className": "TabHeadingDirective",
-    "description": "<p>Should be used to mark <ng-template> element as a template for tab heading </p>\n",
+    "description": "<p>Should be used to mark <ng-template> element as a template for tab heading</p>\n",
     "selector": "[tabHeading]",
     "inputs": [],
     "outputs": [],
@@ -2972,46 +2983,46 @@ export const ngdoc: any = {
       {
         "name": "active",
         "type": "boolean",
-        "description": "<p>tab active state toggle </p>\n"
+        "description": "<p>tab active state toggle</p>\n"
       },
       {
         "name": "customClass",
         "type": "string",
-        "description": "<p>if set, will be added to the tab&#39;s class attribute. Multiple classes are supported. </p>\n"
+        "description": "<p>if set, will be added to the tab&#39;s class attribute. Multiple classes are supported.</p>\n"
       },
       {
         "name": "disabled",
         "type": "boolean",
-        "description": "<p>if true tab can not be activated </p>\n"
+        "description": "<p>if true tab can not be activated</p>\n"
       },
       {
         "name": "heading",
         "type": "string",
-        "description": "<p>tab header text </p>\n"
+        "description": "<p>tab header text</p>\n"
       },
       {
         "name": "id",
         "type": "string",
-        "description": "<p>tab id. The same id with suffix &#39;-link&#39; will be added to the corresponding &lt;li&gt; element  </p>\n"
+        "description": "<p>tab id. The same id with suffix &#39;-link&#39; will be added to the corresponding &lt;li&gt; element</p>\n"
       },
       {
         "name": "removable",
         "type": "boolean",
-        "description": "<p>if true tab can be removable, additional button will appear </p>\n"
+        "description": "<p>if true tab can be removable, additional button will appear</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "deselect",
-        "description": "<p>fired when tab became inactive, $event:Tab equals to deselected instance of Tab component </p>\n"
+        "description": "<p>fired when tab became inactive, $event:Tab equals to deselected instance of Tab component</p>\n"
       },
       {
         "name": "removed",
-        "description": "<p>fired before tab will be removed, $event:Tab equals to instance of removed tab </p>\n"
+        "description": "<p>fired before tab will be removed, $event:Tab equals to instance of removed tab</p>\n"
       },
       {
         "name": "selectTab",
-        "description": "<p>fired when tab became active, $event:Tab equals to selected instance of Tab component </p>\n"
+        "description": "<p>fired when tab became active, $event:Tab equals to selected instance of Tab component</p>\n"
       }
     ],
     "properties": [],
@@ -3026,17 +3037,17 @@ export const ngdoc: any = {
       {
         "name": "justified",
         "type": "boolean",
-        "description": "<p>if true tabs fill the container and have a consistent width </p>\n"
+        "description": "<p>if true tabs fill the container and have a consistent width</p>\n"
       },
       {
         "name": "type",
         "type": "string",
-        "description": "<p>navigation context class: &#39;tabs&#39; or &#39;pills&#39; </p>\n"
+        "description": "<p>navigation context class: &#39;tabs&#39; or &#39;pills&#39;</p>\n"
       },
       {
         "name": "vertical",
         "type": "boolean",
-        "description": "<p>if true tabs will be placed vertically </p>\n"
+        "description": "<p>if true tabs will be placed vertically</p>\n"
       }
     ],
     "outputs": [],
@@ -3053,7 +3064,7 @@ export const ngdoc: any = {
         "name": "type",
         "defaultValue": "tabs",
         "type": "string",
-        "description": "<p>provides default navigation context class: &#39;tabs&#39; or &#39;pills&#39; </p>\n"
+        "description": "<p>provides default navigation context class: &#39;tabs&#39; or &#39;pills&#39;</p>\n"
       }
     ]
   },
@@ -3087,78 +3098,78 @@ export const ngdoc: any = {
       {
         "name": "arrowkeys",
         "type": "boolean",
-        "description": "<p>if true the values of hours and minutes can be changed using the up/down arrow keys on the keyboard </p>\n"
+        "description": "<p>if true the values of hours and minutes can be changed using the up/down arrow keys on the keyboard</p>\n"
       },
       {
         "name": "disabled",
         "type": "boolean",
-        "description": "<p>if true hours and minutes fields will be disabled </p>\n"
+        "description": "<p>if true hours and minutes fields will be disabled</p>\n"
       },
       {
         "name": "hourStep",
         "type": "number",
-        "description": "<p>hours change step </p>\n"
+        "description": "<p>hours change step</p>\n"
       },
       {
         "name": "max",
         "type": "Date",
-        "description": "<p>maximum time user can select </p>\n"
+        "description": "<p>maximum time user can select</p>\n"
       },
       {
         "name": "meridians",
         "type": "string[]",
-        "description": "<p>meridian labels based on locale </p>\n"
+        "description": "<p>meridian labels based on locale</p>\n"
       },
       {
         "name": "min",
         "type": "Date",
-        "description": "<p>minimum time user can select </p>\n"
+        "description": "<p>minimum time user can select</p>\n"
       },
       {
         "name": "minuteStep",
         "type": "number",
-        "description": "<p>hours change step </p>\n"
+        "description": "<p>hours change step</p>\n"
       },
       {
         "name": "mousewheel",
         "type": "boolean",
-        "description": "<p>if true scroll inside hours and minutes inputs will change time </p>\n"
+        "description": "<p>if true scroll inside hours and minutes inputs will change time</p>\n"
       },
       {
         "name": "readonlyInput",
         "type": "boolean",
-        "description": "<p>if true hours and minutes fields will be readonly </p>\n"
+        "description": "<p>if true hours and minutes fields will be readonly</p>\n"
       },
       {
         "name": "secondsStep",
         "type": "number",
-        "description": "<p>seconds change step </p>\n"
+        "description": "<p>seconds change step</p>\n"
       },
       {
         "name": "showMeridian",
         "type": "boolean",
-        "description": "<p>if true meridian button will be shown </p>\n"
+        "description": "<p>if true meridian button will be shown</p>\n"
       },
       {
         "name": "showMinutes",
         "type": "boolean",
-        "description": "<p>show minutes in timepicker </p>\n"
+        "description": "<p>show minutes in timepicker</p>\n"
       },
       {
         "name": "showSeconds",
         "type": "boolean",
-        "description": "<p>show seconds in timepicker </p>\n"
+        "description": "<p>show seconds in timepicker</p>\n"
       },
       {
         "name": "showSpinners",
         "type": "boolean",
-        "description": "<p>if true spinner arrows above and below the inputs will be shown </p>\n"
+        "description": "<p>if true spinner arrows above and below the inputs will be shown</p>\n"
       }
     ],
     "outputs": [
       {
         "name": "isValid",
-        "description": "<p>emits true if value is a valid date </p>\n"
+        "description": "<p>emits true if value is a valid date</p>\n"
       }
     ],
     "properties": [],
@@ -3167,89 +3178,89 @@ export const ngdoc: any = {
   "TimepickerConfig": {
     "fileName": "src/timepicker/timepicker.config.ts",
     "className": "TimepickerConfig",
-    "description": "<p>Provides default configuration values for timepicker </p>\n",
+    "description": "<p>Provides default configuration values for timepicker</p>\n",
     "methods": [],
     "properties": [
       {
         "name": "arrowkeys",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>if true the values of hours and minutes can be changed using the up/down arrow keys on the keyboard </p>\n"
+        "description": "<p>if true the values of hours and minutes can be changed using the up/down arrow keys on the keyboard</p>\n"
       },
       {
         "name": "disabled",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>if true hours and minutes fields will be disabled </p>\n"
+        "description": "<p>if true hours and minutes fields will be disabled</p>\n"
       },
       {
         "name": "hourStep",
         "defaultValue": "1",
         "type": "number",
-        "description": "<p>hours change step </p>\n"
+        "description": "<p>hours change step</p>\n"
       },
       {
         "name": "max",
         "type": "Date",
-        "description": "<p>maximum time user can select </p>\n"
+        "description": "<p>maximum time user can select</p>\n"
       },
       {
         "name": "meridians",
         "type": "string[]",
-        "description": "<p>meridian labels based on locale </p>\n"
+        "description": "<p>meridian labels based on locale</p>\n"
       },
       {
         "name": "min",
         "type": "Date",
-        "description": "<p>minimum time user can select </p>\n"
+        "description": "<p>minimum time user can select</p>\n"
       },
       {
         "name": "minuteStep",
         "defaultValue": "5",
         "type": "number",
-        "description": "<p>hours change step </p>\n"
+        "description": "<p>hours change step</p>\n"
       },
       {
         "name": "mousewheel",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>if true scroll inside hours and minutes inputs will change time </p>\n"
+        "description": "<p>if true scroll inside hours and minutes inputs will change time</p>\n"
       },
       {
         "name": "readonlyInput",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>if true hours and minutes fields will be readonly </p>\n"
+        "description": "<p>if true hours and minutes fields will be readonly</p>\n"
       },
       {
         "name": "secondsStep",
         "defaultValue": "10",
         "type": "number",
-        "description": "<p>seconds changes step </p>\n"
+        "description": "<p>seconds changes step</p>\n"
       },
       {
         "name": "showMeridian",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>if true works in 12H mode and displays AM/PM. If false works in 24H mode and hides AM/PM </p>\n"
+        "description": "<p>if true works in 12H mode and displays AM/PM. If false works in 24H mode and hides AM/PM</p>\n"
       },
       {
         "name": "showMinutes",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>show minutes in timepicker </p>\n"
+        "description": "<p>show minutes in timepicker</p>\n"
       },
       {
         "name": "showSeconds",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>show seconds in timepicker </p>\n"
+        "description": "<p>show seconds in timepicker</p>\n"
       },
       {
         "name": "showSpinners",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>if true spinner arrows above and below the inputs will be shown </p>\n"
+        "description": "<p>if true spinner arrows above and below the inputs will be shown</p>\n"
       }
     ]
   },
@@ -3294,31 +3305,31 @@ export const ngdoc: any = {
   "TooltipConfig": {
     "fileName": "src/tooltip/tooltip.config.ts",
     "className": "TooltipConfig",
-    "description": "<p>Default values provider for tooltip </p>\n",
+    "description": "<p>Default values provider for tooltip</p>\n",
     "methods": [],
     "properties": [
       {
         "name": "container",
         "type": "string",
-        "description": "<p>a selector specifying the element the tooltip should be appended to. </p>\n"
+        "description": "<p>a selector specifying the element the tooltip should be appended to.</p>\n"
       },
       {
         "name": "delay",
         "defaultValue": "0",
         "type": "number",
-        "description": "<p>delay before showing the tooltip </p>\n"
+        "description": "<p>delay before showing the tooltip</p>\n"
       },
       {
         "name": "placement",
         "defaultValue": "top",
         "type": "string",
-        "description": "<p>tooltip placement, supported positions: &#39;top&#39;, &#39;bottom&#39;, &#39;left&#39;, &#39;right&#39; </p>\n"
+        "description": "<p>tooltip placement, supported positions: &#39;top&#39;, &#39;bottom&#39;, &#39;left&#39;, &#39;right&#39;</p>\n"
       },
       {
         "name": "triggers",
         "defaultValue": "hover focus",
         "type": "string",
-        "description": "<p>array of event names which triggers tooltip opening </p>\n"
+        "description": "<p>array of event names which triggers tooltip opening</p>\n"
       }
     ]
   },
@@ -3438,7 +3449,7 @@ export const ngdoc: any = {
       },
       {
         "name": "tooltipChange",
-        "description": "<p>Fired when tooltip content changes </p>\n"
+        "description": "<p>Fired when tooltip content changes</p>\n"
       },
       {
         "name": "tooltipStateChanged",
@@ -3480,26 +3491,26 @@ export const ngdoc: any = {
   "TypeaheadConfig": {
     "fileName": "src/typeahead/typeahead.config.ts",
     "className": "TypeaheadConfig",
-    "description": "<p>Default values provider for typeahead </p>\n",
+    "description": "<p>Default values provider for typeahead</p>\n",
     "methods": [],
     "properties": [
       {
         "name": "adaptivePosition",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>sets use adaptive position </p>\n"
+        "description": "<p>sets use adaptive position</p>\n"
       },
       {
         "name": "hideResultsOnBlur",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>used to hide results on blur </p>\n"
+        "description": "<p>used to hide results on blur</p>\n"
       },
       {
         "name": "isFirstItemActive",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>used to active/inactive the first item in typeahead container </p>\n"
+        "description": "<p>used to active/inactive the first item in typeahead container</p>\n"
       },
       {
         "name": "minLength",
@@ -3511,7 +3522,7 @@ export const ngdoc: any = {
         "name": "selectFirstItem",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>used to choose the first item in typeahead container </p>\n"
+        "description": "<p>used to choose the first item in typeahead container</p>\n"
       }
     ]
   },
@@ -3525,7 +3536,7 @@ export const ngdoc: any = {
       {
         "name": "adaptivePosition",
         "type": "boolean",
-        "description": "<p>sets use adaptive position </p>\n"
+        "description": "<p>sets use adaptive position</p>\n"
       },
       {
         "name": "container",
@@ -3536,7 +3547,7 @@ export const ngdoc: any = {
         "name": "dropup",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>This attribute indicates that the dropdown should be opened upwards </p>\n"
+        "description": "<p>This attribute indicates that the dropdown should be opened upwards</p>\n"
       },
       {
         "name": "optionsListTemplate",
@@ -3561,13 +3572,13 @@ export const ngdoc: any = {
       {
         "name": "typeaheadHideResultsOnBlur",
         "type": "boolean",
-        "description": "<p>used to hide result on blur </p>\n"
+        "description": "<p>used to hide result on blur</p>\n"
       },
       {
         "name": "typeaheadIsFirstItemActive",
         "defaultValue": "true",
         "type": "boolean",
-        "description": "<p>makes active first item in a list </p>\n"
+        "description": "<p>makes active first item in a list</p>\n"
       },
       {
         "name": "typeaheadItemTemplate",
@@ -3594,12 +3605,12 @@ export const ngdoc: any = {
         "name": "typeaheadOptionsInScrollableView",
         "defaultValue": "5",
         "type": "number",
-        "description": "<p>specifies number of options to show in scroll view  </p>\n"
+        "description": "<p>specifies number of options to show in scroll view</p>\n"
       },
       {
         "name": "typeaheadOptionsLimit",
         "type": "number",
-        "description": "<p>maximum length of options items list. The default value is 20 </p>\n"
+        "description": "<p>maximum length of options items list. The default value is 20</p>\n"
       },
       {
         "name": "typeaheadPhraseDelimiters",
@@ -3611,7 +3622,7 @@ export const ngdoc: any = {
         "name": "typeaheadScrollable",
         "defaultValue": "false",
         "type": "boolean",
-        "description": "<p>specifies if typeahead is scrollable  </p>\n"
+        "description": "<p>specifies if typeahead is scrollable</p>\n"
       },
       {
         "name": "typeaheadSelectFirstItem",
@@ -3628,7 +3639,7 @@ export const ngdoc: any = {
       {
         "name": "typeaheadWaitMs",
         "type": "number",
-        "description": "<p>minimal wait time after last character typed before typeahead kicks-in </p>\n"
+        "description": "<p>minimal wait time after last character typed before typeahead kicks-in</p>\n"
       },
       {
         "name": "typeaheadWordDelimiters",
@@ -3648,18 +3659,18 @@ export const ngdoc: any = {
       },
       {
         "name": "typeaheadOnBlur",
-        "description": "<p>fired when blur event occurs. returns the active item </p>\n"
+        "description": "<p>fired when blur event occurs. returns the active item</p>\n"
       },
       {
         "name": "typeaheadOnSelect",
-        "description": "<p>fired when option was selected, return object with data of this option </p>\n"
+        "description": "<p>fired when option was selected, return object with data of this option</p>\n"
       }
     ],
     "properties": [
       {
         "name": "_container",
         "type": "TypeaheadContainerComponent",
-        "description": "<p>if false restrict model values to the ones selected from the popup only will be provided \nif false the first match automatically will not be focused as you type \nformat the ng-model result after selection \nif true automatically select an item when there is one option that exactly matches the user input \nif true select the currently highlighted match on blur \nif false don&#39;t focus the input element the typeahead directive is associated with on selection </p>\n"
+        "description": "<p>if false restrict model values to the ones selected from the popup only will be provided\nif false the first match automatically will not be focused as you type\nformat the ng-model result after selection\nif true automatically select an item when there is one option that exactly matches the user input\nif true select the currently highlighted match on blur\nif false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
       }
     ],
     "methods": []
diff --git a/src/component-loader/component-loader.class.ts b/src/component-loader/component-loader.class.ts
index c3cf0c2ea0..4a031de0d2 100644
--- a/src/component-loader/component-loader.class.ts
+++ b/src/component-loader/component-loader.class.ts
@@ -157,6 +157,7 @@ export class ComponentLoader<T> {
       });
 
       this._componentRef = this._componentFactory.create(injector, this._contentRef.nodes);
+
       this._applicationRef.attachView(this._componentRef.hostView);
       // this._componentRef = this._viewContainerRef
       //   .createComponent(this._componentFactory, 0, injector, this._contentRef.nodes);
@@ -340,10 +341,7 @@ export class ComponentLoader<T> {
       return;
     }
 
-    this._zoneSubscription = this._ngZone.onStable.subscribe(() => {
-      if (!this._componentRef) {
-        return;
-      }
+    this.onShown.subscribe(() => {
       this._posService.position({
         element: this._componentRef.location,
         target: this._elementRef,
@@ -351,6 +349,14 @@ export class ComponentLoader<T> {
         appendToBody: this.container === 'body'
       });
     });
+
+    this._zoneSubscription = this._ngZone.onStable.subscribe(() => {
+      if (!this._componentRef) {
+        return;
+      }
+
+      this._posService.calcPosition();
+    });
   }
 
   private _unsubscribePositioning(): void {
diff --git a/src/popover/popover.config.ts b/src/popover/popover.config.ts
index 6b9d4a19c7..b6435e5c7e 100644
--- a/src/popover/popover.config.ts
+++ b/src/popover/popover.config.ts
@@ -8,6 +8,8 @@ import { Injectable } from '@angular/core';
  */
 @Injectable()
 export class PopoverConfig {
+  /** sets disable adaptive position */
+  adaptivePosition = true;
   /**
    * Placement of a popover. Accepts: "top", "bottom", "left", "right", "auto"
    */
diff --git a/src/popover/popover.directive.ts b/src/popover/popover.directive.ts
index 0d2362bd32..f2f7d77612 100644
--- a/src/popover/popover.directive.ts
+++ b/src/popover/popover.directive.ts
@@ -12,6 +12,8 @@ import { PositioningService } from 'ngx-bootstrap/positioning';
  */
 @Directive({selector: '[popover]', exportAs: 'bs-popover'})
 export class PopoverDirective implements OnInit, OnDestroy {
+  /** sets disable adaptive position */
+  @Input() adaptivePosition: boolean;
   /**
    * Content to be displayed as popover.
    */
@@ -94,7 +96,9 @@ export class PopoverDirective implements OnInit, OnDestroy {
         _renderer
       )
       .provide({provide: PopoverConfig, useValue: _config});
+
     Object.assign(this, _config);
+
     this.onShown = this._popover.onShown;
     this.onHidden = this._popover.onHidden;
 
@@ -119,6 +123,17 @@ export class PopoverDirective implements OnInit, OnDestroy {
       return;
     }
 
+    this._positionService.setOptions({
+      modifiers: {
+        flip: {
+          enabled: this.adaptivePosition
+        },
+        preventOverflow: {
+          enabled: this.adaptivePosition
+        }
+      }
+    });
+
     this._popover
       .attach(PopoverContainerComponent)
       .to(this.container)
@@ -130,6 +145,12 @@ export class PopoverDirective implements OnInit, OnDestroy {
         title: this.popoverTitle,
         containerClass: this.containerClass
       });
+
+    if (!this.adaptivePosition) {
+      this._positionService.calcPosition();
+      this._positionService.deletePositionElement(this._popover._componentRef.location);
+    }
+
     this.isOpen = true;
   }
 
@@ -165,14 +186,6 @@ export class PopoverDirective implements OnInit, OnDestroy {
     }
     this._isInited = true;
 
-    this._positionService.setOptions({
-      modifiers: {
-        flip: {
-          enabled: true
-        }
-      }
-    });
-
     this._popover.listen({
       triggers: this.triggers,
       outsideClick: this.outsideClick,
diff --git a/src/positioning/models/index.ts b/src/positioning/models/index.ts
index 4315155a66..ee99ee84d9 100644
--- a/src/positioning/models/index.ts
+++ b/src/positioning/models/index.ts
@@ -32,5 +32,8 @@ export interface Options {
     flip?: {
       enabled: boolean;
     };
+    preventOverflow?: {
+      enabled: boolean;
+    };
   };
 }
diff --git a/src/positioning/modifiers/preventOverflow.ts b/src/positioning/modifiers/preventOverflow.ts
index 25335bd553..88a851b216 100644
--- a/src/positioning/modifiers/preventOverflow.ts
+++ b/src/positioning/modifiers/preventOverflow.ts
@@ -1,8 +1,12 @@
-import { getBoundaries } from '../utils';
+import { getBoundaries, isModifierEnabled } from '../utils';
 import { Data } from '../models';
 
 export function preventOverflow(data: Data) {
 
+  if (!isModifierEnabled(data.options, 'preventOverflow')) {
+    return data;
+  }
+
   // NOTE: DOM access here
   // resets the targetOffsets's position so that the document size can be calculated excluding
   // the size of the targetOffsets element itself
diff --git a/src/positioning/positioning.service.ts b/src/positioning/positioning.service.ts
index bf3780861b..4a9ef848fc 100644
--- a/src/positioning/positioning.service.ts
+++ b/src/positioning/positioning.service.ts
@@ -76,13 +76,16 @@ export class PositioningService {
 
   position(options: PositioningOptions): void {
     this.addPositionElement(options);
-    this.update$$.next();
   }
 
   addPositionElement(options: PositioningOptions): void {
     this.positionElements.set(_getHtmlElement(options.element), options);
   }
 
+  calcPosition(): void {
+    this.update$$.next();
+  }
+
   deletePositionElement(elRef: ElementRef): void {
     this.positionElements.delete(_getHtmlElement(elRef));
   }
diff --git a/src/positioning/utils/setAllStyles.ts b/src/positioning/utils/setAllStyles.ts
index 0b64733f35..e7e15b147d 100644
--- a/src/positioning/utils/setAllStyles.ts
+++ b/src/positioning/utils/setAllStyles.ts
@@ -60,8 +60,12 @@ export function setAllStyles(data: Data, renderer?: Renderer2): void {
   }
 
   if (renderer) {
-    renderer.setAttribute(target, 'class', target.className.replace(/left|right|top|bottom/g, `${data.placement}`));
+    renderer.setAttribute(
+      target,
+      'class',
+      target.className.replace(/left|right|top|bottom/g, `${data.placement.split(' ')[0]}`)
+    );
   } else {
-    target.className = target.className.replace(/left|right|top|bottom/g, `${data.placement}`);
+    target.className = target.className.replace(/left|right|top|bottom/g, `${data.placement.split(' ')[0]}`);
   }
 }
diff --git a/src/tooltip/tooltip.directive.ts b/src/tooltip/tooltip.directive.ts
index db8ae51a8e..96c0973c09 100644
--- a/src/tooltip/tooltip.directive.ts
+++ b/src/tooltip/tooltip.directive.ts
@@ -230,6 +230,9 @@ export class TooltipDirective implements OnInit, OnDestroy {
       modifiers: {
         flip: {
           enabled: true
+        },
+        preventOverflow: {
+          enabled: true
         }
       }
     });