Merge pull request #246 from crdlc/bug-1067614-v2

Bug 1067614 - [User Story] Ensure users are always on the latest loop mo...(cherry picked from commit 6face3a84eda4b2133fd35d683e2c63267e52f70)